Currently working on the frontend and the get calls.

Merging with code that alex has pushed
Merge branch 'master' of https://github.com/joubin/CSC191

Merging