Merge pull request #3 from landonconover/master

Merge pull request #2 from landonconover/AnotherTest
Merge pull request #4 from landonconover/dream_app_20140217

Merge pull request #3 from landonconover/master