initial css notes
created player div
added derek/josh faces to board
Merge pull request #3 from mule-deer-2014/player_images

Added css for tokens(players) with Derek & Josh's faces.
Merge pull request #2 from mule-deer-2014/initial_css

initial css notes
Add click event to tabble cell.
Center board piece.
Centered board and user profile divs
Board and user divs fill up container div.
Merge pull request #4 from mule-deer-2014/player_images

Player images
toggle between players, stack logic now works
Fix merge conflict on application.css
Merge branch 'stack_logic'
Update index.erb - Added user-info divs.
Merge pull request #6 from mule-deer-2014/update_index_erb

Update index.erb - Added user-info divs.
Update Gemfile
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