commiting changes in appjs to merge with miten's pushed code
Merge branch 'georgedev' of https://github.com/thetmkay/bloomboard into georgedev

Conflicts:
	public/js/app.js