conflic resolutions
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-frontend