merging recent commit
Merge branch 'master' of https://github.com/gold9ine/MusicHarmony

Conflicts:
	.gitignore
	FrontWebPage/MusicHarmony/views/user/form.erb
merging 140418
WebP file added.