Sean: udapting views
updating users
databaseyml
log
merging ozzy's changes with nico's changes, keeping database.yml
everything working on c9
logs
few visual updates
Merge branch 'development' of https://github.com/bananaradiation/kite

# By Sean Thomas Burke
# Via Sean Thomas Burke
* 'development' of https://github.com/bananaradiation/kite:
  few visual updates
  logs
  everything working on c9
  log
  databaseyml
  updating users
  Sean: udapting views

Conflicts:
	log/development.log
	tmp/pids/server.pid