New style!
Forgot all these things
Copy address and popup funtimes
Quick commit
Getting things together!
Login stuff, try to place avatar, didn't go well
Baby steps and starting to inject my css
Table for perks in towns
Lots of town info added
More town stuff, fix some js bugs
Filled out town perks
Try some convex hull action, woop woop
Polish towns images, captions, etc
Start guide, migrate all info in there, figure out css inheritance which is blocking showing stuff atm
Trying guide/tab stuff
Gettin them stupid tabs figured out
Finally figured out the tabs/waypoints situation
Add the arcanum bit to industries
Merge branch 'master' into Halcyon

Conflicts:
	loka/templates/map.html
	loka/templates/townslist.html
	static/js/convex_hull.js
Merge remote-tracking branch 'origin/Halcyon' into Halcyon

Conflicts:
	loka/templates/map.html
	loka/templates/townslist.html