styling + js button listeners
Merge branch 'master' into styling

Conflicts:
	app/views/index.erb
	public/js/application.js
Merge pull request #9 from nifengle/styling

styling + js button listeners