Merge pull request #1 from kelseyobrien/master

Master
Merge pull request #2 from kelseyobrien/master

Master
Merge pull request #3 from kelseyobrien/gh-pages

iProject3