Updated readme
Merge branch 'master' of github.com:Snadde/infotainment
Update .gitignore
Resolved merge conflict in README
Merge development and fix some merge conflicts in project readme
Update LICENSE

fixed faulty year
Merge pull request #91 from span/master

Fix faulty year in license