Merge pull request #4 from Kristjan-S/master

popravil menu tab zgodovina
Delete datoteke.html
Delete app.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/app.js