progress
Merge pull request #6 from DattaUSC/master

progress
Merge pull request #7 from stewartSG/master

changes to pick
Merge pull request #8 from stewartSG/master

changes to innerpage
rework pick.js
Merge branch 'master' of github.com:StephenGrider/Muka

Conflicts:
	public/innerpage/pick.html
Merge branch 'master' of https://github.com/stewartSG/Muka into stewartSG-master

Conflicts:
	public/innerpage/pick.html