Attempting reinstall of devise in light of db issues
Testing reinstall of devise
Fixed and readded devise auth
Merge
Changes to devise
Merge branch 'indi' of https://github.com/otherwhitefrank/ChessMaster into indi
MErged Indi's changes
Merge branch 'indi' of github.com:otherwhitefrank/ChessMaster

Conflicts:
	db/schema.rb
Fixing silly devise
Small change to application.html.erb
Merge pull request #9 from otherwhitefrank/jordan

Jordan
Set up global view template. Created seperate logged in/logged out views. Still working on views.
Ignoring .idea directory
Added pusher API to Rails, update position of devise-user/login
Merge pull request #10 from otherwhitefrank/jeremy

Set up global view template. Created seperate logged in/logged out views...
Fixed Pusher
Final commit, added Pusher API
More changes
More changes
Final merge
Merge pull request #11 from otherwhitefrank/fdye

Fdye