Gruntfile

Made grunt, grunt
Generated files
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/dean-of-students

Conflicts:
	composer.lock
	gruntfile.js
	package.json