First commit configured mysite
Merge branch 'master' of github.com:ian1roberts/marcador_demo
First commit and config