first half of tests written
Merge branch 'master' of https://github.com/ggw215/twitter_master into Andra-Eiko

Conflicts:
	app/controllers/index.rb
fixed conflicts
Merge pull request #8 from ggw215/Andra-Eiko

first half of tests written