jquery, jqueryui, start of file handling
Removing .idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/page.html