Fixed up annoying merge conflict
Fixed up annoying merge conflict

mdda/deep-learning-workshop,mdda/fossasia-2016_deep-learning,mdda/deep-learning-workshop,mdda/fossasia-2016_deep-learning,mdda/deep-learning-workshop