For kola's sake. Removed .project from the gitignore file
Updated the package names to follow the stay in touch naming convention
Merge branch 'working'