Adding a mail class and some settings
Adding some more content to the mail class and sorting out the settings
Creating the error class
Updating my name ;)
Include the answer
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
ignore all of this
Merge branch 'develop' into feature/Error_Report
Merge branch 'develop' into feature/Mail_Class

Conflicts:
	.settings/settings.php
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