first commit
first commit
Merge branch 'master' of github.com:mathilnk/FYS4460Project1