Submitting code
Merge branch 'master' of http://github.com/Hackstore/hackstore

Conflicts:
	hackstore/views/hacks/hackList.js