added website template
added google map
guess marker
user login
guesses
Merge branch 'marvin'