Fixed spacing issues
Added my info
Fixing merge issues
Added Marco's info
Merge pull request #25 from rocketfish/master

Marco's info