junk
no greg3
greg 4 conflicting
greg4 conflictoing from master
Merge /home/ubuntu/dev/django_project
greg4 conflictoing from master this time with text
configlciting with text
delete conflicting greg4.txt
fix dup
fix dup 2p