fixing merge conflict
fixing merge conflict again?
fixed a ton of stuff
Merge branch 'frontend' of github.com:rocketu/klassy into frontend
Merge pull request #11 from rocketu/frontend

Frontend