WIP
Merge branch 'master' of https://github.com/leadcoder/forest_test

Conflicts:
	billboard_generator/billboard_generator.cpp