added changes
Merge branch 'master' of github.com:alexebube/acadaslate.com

Conflicts:
	keystone.js
-m Major changes