Merge pull request #29 from jburnham96/master

Updating my branch
Debug files
Merge pull request #31 from jburnham96/dev_Richard

Dev richard
Merge pull request #32 from jburnham96/master

merge from master to dev james
Converted jpg favicons to .ico
Merge pull request #33 from jburnham96/dev_James

Dev james updating favicon file type
Merge pull request #34 from jburnham96/master

Updating dev_Richard with latest from master