Modal progress
Merge branch 'master' of https://github.com/LawrenceJones/LiveHack

Conflicts:
	app/assets/javascripts/application.js
Implemented buddy_data model
Merge branch 'master' of https://github.com/LawrenceJones/LiveHack

Conflicts:
	app/assets/javascripts/application.js
	app/views/hackathons/show.html.haml