modified rake file to include hackathons
Merge branch 'master' of https://github.com/hackNU/hacknu.github.com

Conflicts:
	README.md