initial
Merge branch 'gh-pages'

Conflicts:
	css/freelancer.css
	index.html
new design