progress
Merge branch 'master' of https://github.com/DattaUSC/Muka into DattaUSC-master

Conflicts:
	public/innerpage/css/portfolio-item.css
	public/innerpage/pick.html