added project and bin to gitignore
added web directory
merged changes