basic markdown working :P
Merge branch 'wmd' into dev-viksit

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
bootstrap and wmd both work
Merge branch 'master' into interim

Conflicts:
	.gitignore
	Gemfile.lock
working interim state
Merge branch 'master' into dev-viksit

Conflicts:
	.gitignore
	Gemfile.lock
working state on my computer
trying to push to heroku
Merge branch 'master' into dev-viksit

Conflicts:
	.gitignore
	Gemfile.lock
pulled lates changes
pulls latest changes
comments the wmd part
removed sqlite3 gem
removed sqlite3 gem
added javascript runtime dependency
assest precompile false
remote removed
moved faker out of test group
removed ap
resolving for heroku, removed non asci chars