Merge branch 'hotfix/extra_word'
Merge branch 'hotfix/analytics'
Merge branch 'release/v0.7'
Merge branch 'release/tcp2'
testing markdown
Removed all html. Updated Readme. Added index.md

Going to start overhauling my site to use markdown for easier ease of
use. This is also a bit of a test commit to see if the index.md file
will be served as index.html by github.
Bumped changelog
Merge branch 'release/v0.10'
Merge branch 'release/v0.10' into develop
Merge branch 'master' of github.com:EJEHardenberg/EJEHardenberg.github.io
Merge branch 'feature/markdown-redo' into develop
bumped version
Merge branch 'release/v0.11'
Removed all html. Updated Readme. Added index.md

Going to start overhauling my site to use markdown for easier ease of
use. This is also a bit of a test commit to see if the index.md file
will be served as index.html by github.
bumped version
Updated index file
Merge branch 'develop'

Conflicts:
	index.md
Added template for styleing

It seems like the only way to get styling on github pages is to let
jeykl do it for you. So there's a template file just so that I can use
my styling. I mean, I could add html headers and such to every line of
my page, but if I'm going for a simple minimilistic page. Then this will
help it along by using the template.
Merge branch 'develop'
fixing template