objectified added, layout cleaned up, .gitignore added
strange conflicts