Auto commiting to Git server
Merge branch 'master' of https://github.com/victorbergelin/djangoapp

Conflicts:
	.DS_Store
	syncGitBackup.sh
Automatic commit to GitHub