Edit conflict file
Merge branch 'proglounge_git_test' of https://github.com/janelabs/proglounge into proglounge_git_test