ignored pyc files
changed the settings file by adding a comment
Merge branch 'testing'

Conflicts:
	app/app/settings.py