Removed merge conflict.
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-ticking-ui