Added more challenges and added options TIME and INVENTORY to main menu
Merge origin/master