commit 8
Merge branch 'master' of https://github.com/stbyrne/LP_Mobile_Dynamic

Conflicts:
	www/css/index.css
	www/js/index.js