Merge branch 'master' of github.com:arielspear/swap-tacular into ariel
Merge pull request #42 from arielspear/tian

Tian
Server now stores string for location that user provides.
Spelling fix
Merge fix.
Merge branch 'grant'
added google js to index
Merge branch 'master' of github.com:arielspear/swap-tacular
added pin drops for map on create.