Merge branch 'master' of https://github.com/achoudhary/kwiz

Conflicts:
	app/views/index.html
Merge branch 'master' of https://github.com/achoudhary/kwiz
Merge branch 'master' of https://github.com/achoudhary/kwiz

Conflicts:
	app/views/index.html
Merge branch 'master' of https://github.com/achoudhary/kwiz

Conflicts:
	app/views/index.html
Merge branch 'master' of https://github.com/achoudhary/kwiz

Conflicts:
	.idea/workspace.xml
	app/javascripts/controllers/quizController.js
	app/javascripts/controllers/timerController.js
	app/views/index.html
Merge branch 'master' of https://github.com/achoudhary/kwiz
Merge branch 'master' of https://github.com/achoudhary/kwiz

Conflicts:
	.idea/workspace.xml
	app/javascripts/controllers/quizController.js
	app/javascripts/controllers/timerController.js
	app/views/index.html