Tons o Changes
Merge branch 'master' of https://github.com/SMLMRKHLMS/SMLMRKHLMS.github.io

Conflicts:
	app/js/app.js