I may have fucked up committing last time
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/Maintheme.css
that white around the labels from my work last week was undesireable,
also changed the +/- to ▲