Picking a location in the form
Merge branch 'master' of github.com:SkidanovAlex/angelhack2

Conflicts:
	index.html