Merge branch 'master' of github.com:techvision/brails4

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/views/layouts/_header.html.haml
	app/views/levels/index.html.haml
Merge conflict removed form Gemlock.lock file
Import Bootstrap min css
After sign in path modified
Attempt funcationality added --partial
Show message if no question present for the topic
Merge branch 'master' of github.com:techvision/brails4

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/views/contents/index.html.haml
	app/views/layouts/_header.html.haml
Aria tags added as in master branch in view file
Merge pull request #40 from pratik14/master

Question/Answer Funcationality --partial
resolve the conflict.
change the seed file.
if youtube channel url is not empty then display the vidio plear. modified the index page for content.