Merge branch 'master' of https://github.com/alexanderbazo/urtalking

Conflicts:
	css/web.css
	js/bundle.js