Back up.
Merge branch 'master' of https://github.com/cbnuke/Bagaroung_shop

Conflicts:
	assets/fonts/glyphicons-halflings-regular.eot
	assets/fonts/glyphicons-halflings-regular.svg
	assets/fonts/glyphicons-halflings-regular.ttf
	assets/fonts/glyphicons-halflings-regular.woff