Merged apps and cleaned up files
Merge branch 'master' of git://github.com/jacarpe5/Stat

Conflicts:
	app/views/users/index.html.erb
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/pids/server.pid