Removed info on turnin
Messing with commits
Merge branch 'noturnin'
Merging changes needed to master