hmmm
Merge branch 'master' of https://github.com/bjornmeansbear/MFAthesis2014

Conflicts:
	index.html
merge conflict with index.html crap