Added basic markup
Merge remote-tracking branch 'origin/dev'

Conflicts:
	index.html
Merged
Merge remote-tracking branch 'origin/dev'
change styles
change index for merge