Windows conio, updated cputs
windows conio, fixed bug with shiftpress
Updated conio.h to be a pure headerfile and added two cpp files for the different builds
Merge