Merged Floobits with git directory and added grid and overlord classes