whathappened
fixed the fucking csproj file that doesn't underfuckingstand how to merge.
Merge branch 'master' of https://github.com/dgl2311/StocksWithFriends into Chris

Conflicts:
	StocksWithFriends/StocksWithFriends/StocksWithFriends.csproj
added js and css files and controler and view
Merge branch 'master' of git://github.com/dgl2311/StocksWithFriends
fixed csproj file, added back a view
fixed duplicate names
Adding news feed
Added stock graph view, color ticker objects based on trend
Merged
Readded Stock graph views
Shit that shouldn't be pushed
Merge
Adding Ian's Changes
Adding staging settings
Merge https://github.com/dgl2311/StocksWithFriends

Conflicts:
	StocksWithFriends/StocksWithFriends/Content/Site.css
	StocksWithFriends/StocksWithFriends/Controllers/FacebookController.cs
	StocksWithFriends/StocksWithFriends/StocksWithFriends.csproj
	StocksWithFriends/StocksWithFriends/Views/Home/Index.cshtml
	StocksWithFriends/StocksWithFriends/Views/Stock/LookUp.cshtml
	StocksWithFriends/StocksWithFriends/Views/Stock/Ticker.cshtml
Merge remote-tracking branch 'origin/Chris'

Conflicts:
	StocksWithFriends/StocksWithFriends/Controllers/FacebookController.cs
	StocksWithFriends/StocksWithFriends/StocksWithFriends.csproj
	StocksWithFriends/StocksWithFriends/Views/Facebook/AddFriend.cshtml
	StocksWithFriends/StocksWithFriends/Views/Shared/_Layout.cshtml
Restores missing styling.  Restores missing logo.  Adds static navigation bar.