Bugfix and new function

Replaced instances of  // with # for comments,
added a new function for extra humor.
Test change

The truth...
Merge pull request #1 from ethanmata/ethan's-branch

Bugfix and new function
Merge pull request #3 from MattVillarrubia/MattBranch

Test change
Merge branch 'master' into coolbranch