drag and drop works
Merge branch 'master' of https://github.com/stefanetoh/Iprog14_Group20_Project

Conflicts:
	app/app.js
	index.html
	js/controllers.js
	views/mainView.html