API call
request all programs
Merge branch 'master' of https://github.com/se1-1314/xiast into back-front-interaction
Comments / documentation
sa marche
Ajax calls instead of JSON calls to allow bodies to be send to server. Need to find out the expected input on the server side to be able to continue
I accomplished nothing
Programs are working
need dummy data before I can continue with course
layout  edit
Merge branch 'master' into back-front-interaction
Listing programs
Listing courses by program
overflow-y fix
Merge branch 'master' of https://github.com/se1-1314/xiast
Merge branch 'master' of https://github.com/se1-1314/xiast
created semi-schedulingAPI.js
Merge branch 'back-front-interaction' of https://github.com/se1-1314/xiast into back-front-interaction
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 :)