Merge branch 'master' into 2014
made pages posts and filtering them based on YAML -- cleaned up js so it doesn't error when it gets data it does not like.
Add these things to last commit
commit dammit
test
igrnore all this annoying shit
try to ignore this now dick
get rid of this shit
got everything cleaned up
ignore
Merge branch '2014'

Conflicts:
	.gitignore
	ad.html