test of commit
test change
Merge branch 'master' of https://github.com/awanderson/photo_journal.git
test commit deal