Merge branch 'bootstrapv2.3'

Conflicts:
	bootstrap/img/glyphicons-halflings-white.png
	bootstrap/img/glyphicons-halflings.png
Merge branch 'master' of https://github.com/pongstr/pongstagr.am