merging
Merge branch 'master' of https://github.com/BinaryHeart/EServicesAndWebprograming
first loop of requirements for labbs
Change order of labs 3 and 4
Clarify refactoring exercise
Add more info for the SPA exercise
Restructure folders
Merging 'master' into 'gh-pages'