Balogna
Merge branch 'master' of https://github.com/MicahFulton/SocialStocks

Conflicts:
	app/views/home/index.html.erb
yes
Newest Styling