rake db - production
fixed password javascript error message
deleted irrelevant comments
Merge branch 'nick-testing'
more styling

created proper footer
width of nav bar and footer now = browser width
error messages colored red
Merge branch 'nick-testing'
Merge branch 'nick-testing'
Merge branch 'master' of https://github.com/lbochenek/urList

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid