fixed bugs and made followers and following associations
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
Merge pull request #11 from ggw215/Andra-Eiko

fixed bugs and made followers and following associations