Merge branch 'master' of https://github.com/rishijain/brails
fixed - Theme settings are not propogated
Have modified topic/show
Have removed show_topics partial. Have added partials named _questions and take_test. Have written question|answers form.
hide the sign up link after user login.
Merge branch 'master' of github.com:nitinzd/brails
modified the topic show page.
Changed logic of showing cookies. Have fixed some bugs in topic/show
Merge pull request #15 from girishso/master

Fixed: Theme settings are not propogated!
Have removed model bonus_cookies. No more required. Have removed partial questions.
Re-enabled ARIA grid
Have changed the logic of showing cookies in levels/show. Have added a method in application controller to calculate cookies for a topic.
Merge branch 'master' of github.com:nitinzd/brails
Updated some styling
Merge branch 'master' into design

Conflicts:
	app/assets/stylesheets/_layout.scss
	app/assets/stylesheets/_topic.scss
	app/views/levels/index.html.haml