Shift masher hacker to another file
Merge branch 'master' of github.com:BeaverLodge/CorrelateTHIS

Conflicts:
	scripts/app.js