Merge pull request #30 from jburnham96/master

Updating richards branch with latest from master
Uploading favicon

Uploading large and small favicons
Merge pull request #31 from jburnham96/dev_Richard

Dev richard
Merge pull request #32 from jburnham96/master

merge from master to dev james