compiled 04
Merge branch 'master' of github.com:tronje/ALA
finished 2 and 6