trying to create a conflict
Merge branch 'master' of github.com:Plesin/bookmarks

# By Radek - Win7
# Via Radek - Win7
* 'master' of github.com:Plesin/bookmarks:
  disable button
  jslint

Conflicts:
	views/list.html