fixing gemfile.lock issue
Merge branch 'master' of https://github.com/TechFounder/stepup

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/style.css.scss