Initial commit
Update .gitignore
Merge branch 'master' of github.com:berdof/socailmart

Conflicts:
	.gitignore
upload social mart markup