js1
Merge branch 'staging' of https://github.com/brown-bats-2014/ConnectFour into staging

pull
dsf
Merge branch 'staging' of https://github.com/brown-bats-2014/ConnectFour into staging

asfd
controller&view