Testing to see if branches will work
Seeing if travis-ci will auto-upload builds to github
Merge pull request #1 from bigbeno37/dev

Happy with the merge