Updated app to Bootstrap 3.0
Removed assets
Added Friendships
Merge branch 'master' of github.com:blueexpert11/Bounce

Conflicts:
	app/views/layouts/application.html.erb
Fixed error