stuff from aws
Merge branch 'master' of github.com:aimran/git-discover

Conflicts:
	app/views.py