initial commit
Merge branch 'master' of https://github.com/se1-1314/xiast
Merge branch 'master' of https://github.com/se1-1314/xiast
corrected mockprograms
Bug fixed by removing js include
added Profile option in dropdown
Merge branch 'back-front-interaction' of https://github.com/se1-1314/xiast into back-front-interaction
merge with back-front-interaction
Merge branch 'master' of https://github.com/se1-1314/xiast
Merge branch 'master' into back-front-interaction

Conflicts:
	resources/public/js/programAPI.js
	resources/templates/curriculum-info.html
	resources/templates/layout.html
basic functionalities and layout student: DONE!
also approved by Project Manager :)
Merge branch 'master' into back-front-interaction
added 1st en 3rd bach
completed mockschedules
Merge branch 'master' into mockschedules
Merge branch 'master' of https://github.com/se1-1314/xiast into semi-scheduling
Update core.clj
Created several profile pages