Merge branch 'dev_anpatel' of github.com:sramanujan/FightWithFriends into dev_sramanujan
Merge branch 'dev_anpatel' into dev_sramanujan
Top and bottom panels now working fine
Merge branch 'dev_anpatel' of github.com:sramanujan/FightWithFriends
Adding new images, changed config jsons, added json loaders, and changed image loading for units and towers
Reverting to oldstyle assets
Commiting broken assets