Django setup & google apps verification
Github remote added
Merge remote-tracking branch 'origin/master'