trying to revert merges and reset HEAD to somewhere in the commit history.
Merge branch 'gh-pages' of https://github.com/thisispayal/marketing-site into gh-pages

Conflicts:
	assets/css/styles.css
	contact/index.html
	index.html
I think this works now and all is finally right with the world. Still missing some parts of index.
Merge pull request #23 from thisispayal/gh-pages

Commits hopefully resolved the merge issues.