add divs to html
formatting and add shake
fix merge conlix
Merge branch 'master' of https://github.com/fr151/johannjs

Conflicts:
	app.js
	assets/views/index.html
changes to client
fix merge conflicts
acceleramoeter threshold
fix merge
IM THE KING
add web elements
i the dl