Initial commit with basic layout and placeholders for content
Merge http://github.com/jofayard/mySite

Conflicts:
	LICENSE
Initial commit with placeholders for content....