Change Gemfile
Merge branch 'master' of https://github.com/Williampangestu/Lil-Twitter
modify gemfile to rbu 2.0.0
Fixed break on invalid login
Added relevant error messages on login page.
Invalid login reroutes back to login page with error message.
Create Account now auto logs in and routes to dashboard instead of back to index.
User's followers and following lists now link to relevant user pages.
Merge branch 'master' into login
Fixed accidentally removed <div> tag
Conflicts:
	app/views/login_page.erb
Merge pull request #17 from Williampangestu/login

Fixed break on invalid login
change main page login and sign up
Merge pull request #18 from Williampangestu/william

change main page login and sign up
This page made unnecessary by main_page create_acct
Page made unnecessary by main_page login
search
search
Added in commented out Gravatar functionality
Must add User email attribute to allow individual user pictures.
Merge pull request #21 from Williampangestu/gravatar

Added in commented out Gravatar functionality
Merge pull request #20 from Williampangestu/Dashboard-Styling

added dashboard and profile page styling
Committing to stash
Merge branch 'travis_2' of https://github.com/Williampangestu/Lil-Twitter into gravatar
Merge branch 'travis_3'
Merge branch 'master' of https://github.com/Williampangestu/Lil-Twitter

Conflicts:
	app/views/dashboard.erb
	app/views/profile_page.erb
Merge branch 'master' into Dashboard-Styling

Conflicts:
	app/views/follower.erb
	app/views/following.erb