public snapshot
merged
snapshot
removed public from cache
Merge branch 'master' of https://github.com/rexk/skyportsystems.github.io
Merge pull request #4 from rexk/feature/hugo-layout

Adding default templates
fixed conflict
splash html changes
added missing fontawesome file
Merge pull request #6 from alfredkam/master

splash html
Merge branch 'master' of github.com-rexk:rexk/skyportsystems.github.io into feature/hugo-layout

Conflicts:
	layouts/partials/head_includes.html
	layouts/partials/page_header.html