new pt-page-6
Merge branch 'new_site' of github.com:orobix/orobix.github.com into new_site

Conflicts:
	css/component.css
	index.html