First commit
Merge branch 'master' of https://github.com/EddyLane/uvd-hackday

Conflicts:
	app/scripts/app.js