Merge pull request #6 from calvinbrown085/master

Merge 2
Merge pull request #7 from calvinbrown085/Whats-up

Merge pull request #6 from calvinbrown085/master