No idea why this is happening.
Not sure what's going on here - trying to update some code in another branch and merge it into master.
Merge branch 'updates_071514'
Merge branch 'master' of github.com:jordanlgraham/handsomedog