Merge remote-tracking branch 'origin/workingBranch'
Merge remote-tracking branch 'origin/workingBranch'
Merge remote-tracking branch 'origin/gh-pages'
Added data.xml (with 5 events for now) and working function to display it. Small tweaks in html.
Removed non-funtional loop from xml display function
Added Mindmap and Wireframe screenshots to repo
Merge remote-tracking branch 'origin/workingBranch'
Merge remote-tracking branch 'origin/master' into gh-pages