test
Merge pull request #1 from churichard/Brandon

stuff
Added function
Merge branch 'master' of https://github.com/churichard/Test
Updated master
Merge remote-tracking branch 'origin/master' into dev