test2

github test2
Merge pull request #1 from jmounts234/master

Update
Merge pull request #2 from lucaslou/master

update 2