core zend functionality and two-framework basic architecture sketched
git ignore fix
conflicts
remove .DS_Store
data folder