Gitignore from Cloud9
Merge branch 'master' of github.com:margiecalvert/Prog270-Calvert

"Not sur
git commit -m "Not sure why I had to merge."