clean up
gitignore
commit
Merge branch 'master' of https://github.com/derwentx/laserCommerce

Conflicts:
	untitled.sublime-workspace