adding something to .gitignore
Updated django-json-rpc
Merge branch 'master' of github.com:DesignerTUM/creyoco
remove apache config from .gitignore
Merged newest design