Working first week sorta
Final bridge changes
Merge branch 'master' of https://github.com/Dewb/moody

Conflicts:
	src/main.cpp