Edit mode to do view
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/public_html/css/main.css
	frontend/public_html/index.html
Merge branch 'master' of https://github.com/NorthFury/hackathon
Merge branch 'master' of https://github.com/NorthFury/hackathon