Revert "Merge pull request #6 from TheComet93/master"

This reverts commit 055977c04f08c3d3e29803096863d0a64ca4063c, reversing
changes made to ad017b5e8499fcfd8496970953b36f685de24389.
Revert "Revert "Merge pull request #6 from TheComet93/master""

This reverts commit d39bb1d49e31bf76204709b724820e3b37cdc862.
Ironing out boost linking
Merge branch 'master' of https://github.com/karljacques/Teabag
Merge branch 'master' of https://github.com/TheComet93/Teabag

Conflicts:
	src/CMakeLists.txt