sarah checking in
added new file
Merge pull request #1 from AkermanGreg/sarah

sarah checking in
Merge branch 'martina'

Testing merge
.
testing merges
Merge branch 'master' of https://github.com/AkermanGreg/happy into greg
Updating local
added some shit
Jokes on Jokes
Merge pull request #3 from AkermanGreg/greg

Greg
Merge pull request #4 from AkermanGreg/samisgod

Jokes on Jokes
more changes
Merge pull request #5 from AkermanGreg/greg

more changes
no comment
committing with fons
experiment git on wednesday