changes from before thanksgiving
added git pull items
fixed some changes from pull
rectified conflicts
adjusting merge conflicts