asfasdf
whatever
Merge branch 'master' of https://github.com/sjafri5/chaturanga_chess

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/69cc4610ea6ed54817db15de04f67f31
	tmp/cache/assets/development/sprockets/7f988955f467b135629e37806ae56db2
	tmp/cache/assets/development/sprockets/d0b732f1173127bad531ce55e54a4509
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/pids/server.pid
Merge branch 'master' of https://github.com/sjafri5/chaturanga_chess
blah