Implemented basic conundrum
updated version history
Added timer to conundrum
Added TheTimer.java
Added markers changes
Tidied up conundrum
merged latest dev
mergered dev
more merge problems
commiting my mess to acces it at uni
Added generate letters
filled in play method
Basic working version of word round