Change
Merge branch 'master' of https://github.com/SMLMRKHLMS/SMLMRKHLMS.github.io

Conflicts:
	app/js/app.min.js
	app/js/directives/Page.js