pre-pull commit
'commit'Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/4Functioneers into myFunctioneers

Conflicts:
	app/scripts/main.js
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/4Functioneers into myFunctioneers
I dont know
test commit
Merge pull request #18 from MikeESL/myFunctioneers

My functioneers- trying!