Initial commit
fix conflict
Merge branch 'master' of github.com:mikeross87/demo_app
fix conflict
git commit -m 'fix error'