first commit
update screen shoot location
typo fixes
fix pull conflict