Homework 6
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	angular-dragdrop.1.0.8.min.js
	index.html