Auto-detecting https
FULL SCREEN!
merge
Almost fixed ghost bunnies
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
Log conf. Updated simsim
Merge branch 'master' of github.com:dcrosby42/aoldrts
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
adds camera panning
Merge branch 'master' of https://github.com/dcrosby42/aoldrts
proper logo
logo fix;
Client-side message spying logging
Merge branch 'master' of github.com:dcrosby42/aoldrts
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
Fix missing bunny
Merge branch 'makr'

Conflicts:
	public/js/app.js
	src/rts_world.coffee
Removed stale line of code
merged master;
Merge branch 'AI' of https://github.com/dcrosby42/aoldrts into AI

Conflicts:
	public/js/app.js
	src/rts_world.coffee