Initial commit
Initial commit
Merge branch 'gh-pages' of https://github.com/rogermmg/SmartSite
Merge branch 'master' of https://github.com/rogermmg/SmartSite

Conflicts:
	README.md
fdsadsafdsa
���Ǹ���
Merge branch 'gh-pages' of https://github.com/rogermmg/SmartSite into index

Conflicts:
	index.html