refs #11 finished the first mock up
Added links for github and twitter
Merge branch 'master' of github.com:Ordojan/ordojan.github.io

Conflicts:
	_mockups/1/index.html