submit with google button added to login page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	serviceWebsite/tesla/app/templates/login.html

Merging with Leon
submit through google button added to login
Merge pull request #22 from echen027/master

Added submit via google login button.