commit remove
Merge branch 'master' of github.com:CE-KMITL-OOAD-2014/Online-Music-Controller

Conflicts:
	templates/account.html