idea
Merge branch 'master' of github.com:chioshinu/audio

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of github.com:chioshinu/audio
fix gemfile and application layout