github generated gh-pages branch
[monthly general] Ephraline
Whitespace
Fleshing out of conquest battle, main infrastructure
Cleanup, remove some non working code, more conquest groundwork
Further fleshing out of conquest battles, still far from being ready. Alot of useless code needs to be removed and more different code to be created
Merge branch 'general' of git@github.com:magowiz/Castle-Age-Autoplayer.git
Merge branch 'gh-pages' of git@github.com:magowiz/Castle-Age-Autoplayer.git
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer

Conflicts:
	Chrome/unpacked/js/caap_mainloop.js
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
Menu fix
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
jslint
Add some extra loggin info
Added some extra loggin information
Fix some page and id detection for monster fighting
More ID detection for fightinh monsters
More id monster fixes
Conquest for monster dash changes