Updates
New features and better sizing
Merge branch 'master' into updates

Conflicts:
	main.js
Fixing graphical animation glitch