Moving to new dev
Fixed conflicts
Committing to save progress.
Committing progress
Commiting progress
Commiting progress
Commiting progress
Committing progress
Committing progress
Removed stuff that shouldn't have been in master.