First commit
Merge pull request #2 from ryanatty/master

First commit to dev