ahaaaa
Merge pull request #1 from trippel/startup

ahaaaa
test for gh-pages
Merge branch 'gh-pages' of https://github.com/trippel/trippel.github.io into gh-pages
test.txt for great justice
Merge pull request #2 from trippel/gh-pages

gh-pages are confusing me right now?