whaty
Fixed site
Merged conflicts
updated readme
win to mac merge master
merge conflicts two