Exercise screen mostly done.
Trying to properly sync with repository.
Merge branch 'master' of https://github.com/JasonL663/SENG-310-Interface-Prototype

Conflicts:
	App/index.html
Merge branch 'master' of https://github.com/JasonL663/SENG-310-Interface-Prototype
More updates
Adding and renaming files
last commit
Merge branch 'master' of https://github.com/JasonL663/SENG-310-Interface-Prototype