adding cicero interaction
fixing gitignore
Merge branch 'master' of github.com:christophernies/watersafe
Merge branch 'master' of github.com:christophernies/watersafe
Renamed keys apikeys
Adding The Values to the results
Merge branch 'master' of https://github.com/christophernies/watersafe
Merge branch 'master' of https://github.com/christophernies/watersafe
Merge branch 'master' of https://github.com/christophernies/watersafe
Fix up template
Merge branch 'master' of https://github.com/christophernies/watersafe

Conflicts:
	watersafe/templates/results.html
	watersafe/watersafe_site/views.py