Added f4 and f4
Merge branch 'master' of github.com:TobiasWrigstad/ioopm14