Bootstrap upgrade to 3.1.1
Merge branch 'master' of https://github.com/saharrehani/Pinster

Conflicts:
	www/index.html