Query: program-add!
Query: program-add!
User-functions and program manager
Merge branch 'nilsbranch' of github.com:se1-1314/xiast into nilsbranch

Conflicts:
	src/xiast/database.clj
	src/xiast/query.clj
Updated schema and added SQL file
Table 'Xiast.person' doesn't exist
Well, now it does! :D
Merge pull request #95 from se1-1314/Table_xiast.person

Table 'Xiast.person' doesn't exist
Undo last change
Merge branch 'master' into nilsbranch
Login bug fix
Merge pull request #97 from se1-1314/nilsbranch

Login bug fix
Query compliance
Merge pull request #98 from se1-1314/nilsbranch

Query compliance
Minor debug accounts
Merge pull request #99 from se1-1314/debugauth

Minor debug accounts
Awesome fixes annoying bug
Really awesome! when you log out, ... you get your default navbar back!
me so awesome!

*Happy dance*

Fixes #90
Merge pull request #103 from se1-1314/Awesome_me_debugging

Awesome fixes annoying bug
Merge branch 'master' of https://github.com/se1-1314/xiast into program-manager_templates