acount added
Merge branch 'master' of https://github.com/Wyshme/wyshme

Conflicts:
	.gitignore
	app/assets/javascripts/application.js
	app/views/layouts/_content_for_account.html.erb
	app/views/layouts/application.html.erb
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid
js moved