initial commit
Merge branch 'master' of github.com:laurikin/Joulu_2014-15