something
Merge branch 'master' of github.com:pseeth/shout
recording audio
Merge branch 'master' of github.com:pseeth/shout

Conflicts:
	static/fonts/glyphicons-halflings-regular.eot
	static/fonts/glyphicons-halflings-regular.svg
	static/fonts/glyphicons-halflings-regular.ttf
	static/fonts/glyphicons-halflings-regular.woff
	templates/contribute.html