Added independent login functions for player 1 and 2
renamed index.erb to index2.erb
added index2.erb
Merge branch 'master' of https://github.com/mule-deer-2014/kalinc-four into chandler_igor

Conflicts:
	app/controllers/index.rb
	app/views/index.erb
	public/css/application.css
Merge branch 'chandler_igor' of https://github.com/mule-deer-2014/kalinc-four into chandler_igor

Conflicts:
	app/views/index2.erb
Merge pull request #7 from mule-deer-2014/chandler_igor

Chandler igor login updated
Katia's amazing JS changes
Fix css.
updated erb for get '/' route
Merge branch 'master' into js_is_awesome
Merge pull request #8 from mule-deer-2014/js_is_awesome

Js is awesome
i hate myself
Merge pull request #9 from mule-deer-2014/user_logins_added

i hate myself
CSS styling