js file
Merge branch 'master' of https://github.com/mirahman/gphr

Conflicts:
	assets/javascript/sams.js
	dashboard.html
	index.html