edit
Merge branch 'master' of https://github.com/lordmilutin/hakaton

Conflicts:
	app/views/master.blade.php
	app/views/template/master.blade.php
	app/views/template/menu.blade.php
Merge branch 'master' of https://github.com/lordmilutin/hakaton

Conflicts:
	app/views/master.blade.php
	app/views/template/master.blade.php
	app/views/template/menu.blade.php