Merge pull request #1 from skyrogue/master

hey y'all
----
this is alice merging eloy's pull request
This is a commit from Alice
Merge pull request #2 from spirnuise/master

This is a commit from Alice 
I guess we can add her
Like you know whatever 
This is Eloy Merging!!!
File called blah
Merge pull request #3 from spirnuise/master

File called blah