working on compose form
Merge branch 'master' of https://github.com/rit/LAplus

Conflicts:
	app/views/voices/index.html.haml