Pushing changes to main.js
Merge branch 'master' of https://github.com/lbdeyo/motorola

Conflicts:
	motorola1/.idea/workspace.xml