update
old
Merge branch 'master' of github.com:rails-girls-sofia-study-group/trudovak

Conflicts:
	public/javascript/scripts.js
	views/sign_as_html.erb
BUG FIX: white space and enter replaced by enter