Added filters forms etc.
Merge branch 'master' of https://github.com/SkidanovAlex/angelhack2

Conflicts:
	index.html