Merge pull request #8 from ggw215/Andra-Eiko

first half of tests written
made the thing work again
Merge pull request #9 from ggw215/greg

made the thing work again
pushing
Merge pull request #10 from ggw215/greg

pushing
Merge branch 'master' of https://github.com/ggw215/twitter_master into Andra-Eiko

Conflicts:
	app/controllers/index.rb
	app/models/user.rb
merge conflicts resolved followers and such enabled