old stuf
Merge branch 'master' of https://github.com/knathanieltucker/project

Conflicts:
	Presentation/Poster/poster.tex
removed