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

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

rspec done