Add Twitter results.
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

I don't know dude. It went to fast for me to see what the merge conflict was, I just need to keep working.
Create feed action in twitter, routs for subscribe, add icons to results.
log out
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

Conflicts:
	app/views/home/index.html.erb

Commit to catch up.
add logout
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

Conflicts:
	app/views/home/index.html.erb
	config/routes.rb

Merging conflicts
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

Conflicts:
	app/views/home/index.html.erb

merging conflicts
Merge branch 'skwak'
changes backround color
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine
add merge