initial project version
Minor change to learn
Merge branch 'master' of git://github.com/ThorsteinnAdal/Project1