grid showing up properly
Merge branch 'master' of git://github.com/pbevin/hex into hexworking
Merge branch 'hexworking'
javascript click working
Merge branch 'hexworking'
Merge branch 'board_model'
Initial Frontend
Merge branch 'master' into frontend

Conflicts:
	app/views/layouts/application.html.erb
adding pry