Creating base template
Merge branch 'master' of github.com:dalequi/stalkroid