.gitignore - ignore google_appengine
remove appengine (will install)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
remove google app engine again (after merge)