new file:   .gitignore
Merge branch 'master' of github.scm.corp.ebay.com:fazli/SecWeb

Conflicts:
	.gitignore

	modified:   .gitignore
	modified:   app.py
	renamed:    app.wsgi -> wsgi.wsgi