Added junit testing to the project, this tests if certain things in the project are correct when building
Merge branch 'ferrybig'