from aptana first time
Merge branch 'master' of https://github.com/shjelm/labb1