Frontend finished?

*No tested :P
Merge branch 'master' of https://github.com/m2march/isw2

Conflicts:
	src/query.py