Round1 Timer + fixed too many setIntervals
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
collectibles badge
Merge branch 'master' of github.com:pprmint/pchallenge

Conflicts:
	application/controllers/round2.php