...
Merge branch 'master' of github.com:JobyKK/Delux

Conflicts:
	app/views/categories/add.html.erb
	app/views/categories/add.html.erb~
seccccccond
newBoot