More stuff
Merge branch 'master' of https://github.com/rogerbutt/Banter

Conflicts:
	app/views/record.html