meeeh
Merge branch 'master' of https://github.com/GTrebaol/SupraStatsUI

Conflicts:
	app/assets/css/style.css
	app/servers/servers.html