deleted nonsense files
Merge dev into working-alpha
New stuff!!