too much swag
Merge branch 'master' of https://github.com/adrianc-a/kare

Conflicts:
	Frontend/index.html