#3 add a very strange line
#3 pull from upstream
#3 add new line
#3 add new line
Merge pull request #19 from fortegente/master

#3 the second test commit