Related: #17
Just testing some stuff
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses

Conflicts:
	src/xiast/core.clj
Related #17

Taking a new direction on displaying and selecting coursing
Going for the jquery way
initialise jquery
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses

Conflicts:
	resources/templates/index.html
made paths absolute
css
Not sure what needs to be comitted
some changes to core.clj
I think it's just a newline
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses

Conflicts:
	resources/templates/layout.html
show courses
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses
Merge branch 'master' of https://github.com/se1-1314/xiast into show_courses
Fixes #26
Fixes #24
Listing all courses #21
Merge pull request #36 from se1-1314/show_courses

Show courses
automatic merge