21guns
merging with sangha
merging application.erb
fixing login