Commit progress
Merge branch 'master' of https://github.com/banothu2/HackMIT

Conflicts:
	views/index.dust