Updated gitignore
Added derby files to gitignore
UML added for model
Merge branch 'master' of https://github.com/M92/Beta
Merge branch 'master' of https://github.com/M92/Beta into model
small modification