First Commit
Merge branch 'master' of github.com:AcadaMe/acadaslate.com

Conflicts:
	.gitignore