merge
Merge branch 'master' of https://github.com/ifhackathon/ifhackathon.github.io

Conflicts:
	stylesheets/app2.css
Merge branch 'master' of https://github.com/ifhackathon/ifhackathon.github.io
responsive template