stuff
Merge branch 'master' of https://github.com/gregdaynes/Github-Module-Repo

Conflicts:
	Gruntfile.coffee