changes
Merge branch 'master' of https://github.com/dcurl47/ontheway

Conflicts:
	app/templates/login.html
Merge branch 'master' of https://github.com/dcurl47/ontheway
commiting from aws
deleted stuff
 Merge branch 'master' of https://github.com/dcurl47/ontheway

Conflicts:
	app/query_yelp_db.py
	app/templates/login.html
fixed security issues
Merge branch 'master' of github.com:dcurl47/ontheway
adwq
adding .gitignore