Testing github pushing
Merge pull request #1 from torgeirjohansen/master

Testing github pushing