Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Switching to new codename, adding deisgn goals
Merge branch 'develop'
Merge pull request #2 from TheRyanHowell/master

pull ryans code
Adding some basic text files giving brief descriptions of the model.
Merge branch 'develop' into feature/Forms
Fixing licence
Merge branch 'develop' into feature/Forms
Fixing/Implementing the login system into user class
Merge branch 'feature/Badger_Changes'

* feature/Badger_Changes:
  Fixing/Implementing the login system into user class
  Fixing licence
  Adding some basic text files giving brief descriptions of the model.
Merge branch 'develop'
Merge pull request #6 from PACSDevelopers/master

Fixing/Implementing the login system into user class
Merge branch 'master' into develop
Merge branch 'develop' into feature/Forms
Updating feature list
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms'