oops tests
Merge branch 'master' of github.com:polytechnice-si/5A-2014-SOA1