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
Undo last change
Merge branch 'master' into nilsbranch