Merge branch 'feature/Forms' into develop
Merge pull request #7 from MobliMic/develop

Pulling some of mic's changes into develop.
Merge branch 'develop' into feature/Forms
Making functions return something
Merge branch 'feature/Forms' into develop
Merge branch 'develop'
Merge pull request #6 from TheRyanHowell/master

Pull Ryans code into my repo
Merge branch 'develop' into feature/Settings_Update