Round 2 view added
Merge branch 'master' of http://github.com/pprmint/pchallenge
Round1 Timer + fixed too many setIntervals -Mark
added some round2 betting scheme
added some round2
Merge branch 'master' of http://github.com/pprmint/pchallenge
round 1 view and css -mayen mm
Initial Round 2 question handler added
Merge branch 'master' of http://github.com/pprmint/pchallenge
Round 2 question handler added
badge collection for round1, cluster edit of questions for round 1
Merge branch 'master' of https://github.com/pprmint/pchallenge

Conflicts:
	application/models/app_model.php
refactor round1
round1 refactoring
Merge branch 'master' of github.com:kimini507/pchallenge

Conflicts:
	application/views/round1_view.php