not sure how i forgot these
clean branch
Merge branch 'gh-pages'

Conflicts:
	germanhelp/akk-dative_preps.html
	germanhelp/dative_preps.html
	germanhelp/definite.html
	germanhelp/der_die_das.html
	germanhelp/direction.html
	germanhelp/genetive_preps.html
	germanhelp/indef.html
mv
fix paths
update
i'm AWFUL at this
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_includes/foot.html
	_includes/head.html
	_includes/menu.html
	_layouts/default.html
	_layouts/post.html
	_posts/2014-03-14-welcome-to-jekyll.markdown
	_site/css/flexbox.css
	_site/css/foundation.css
	_site/css/foundation.min.css
	_site/css/normalize.css
	_site/direction.html
	_site/js/foundation.min.js
	_site/js/foundation/foundation.abide.js
	_site/js/foundation/foundation.accordion.js
	_site/js/foundation/foundation.alert.js
	_site/js/foundation/foundation.clearing.js
	_site/js/foundation/foundation.dropdown.js
	_site/js/foundation/foundation.equalizer.js
	_site/js/foundation/foundation.interchange.js
	_site/js/foundation/foundation.joyride.js
	_site/js/foundation/foundation.js
	_site/js/foundation/foundation.magellan.js
	_site/js/foundation/foundation.offcanvas.js
	_site/js/foundation/foundation.orbit.js
	_site/js/foundation/foundation.reveal.js
	_site/js/foundation/foundation.slider.js
	_site/js/foundation/foundation.tab.js
	_site/js/foundation/foundation.tooltip.js
	_site/js/foundation/foundation.topbar.js
	_site/js/vendor/fastclick.js
	_site/js/vendor/jquery.cookie.js
	_site/js/vendor/jquery.js
	_site/js/vendor/modernizr.js
	_site/js/vendor/placeholder.js
	akk-dative_preps.html
	dative_preps.html
	definite.html
	der_die_das.html
	genetive_preps.html
	grammar_songs.html
	indef.html
	index.html