no message
no message
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
Merge commit '67f270990e80fac0b9ef2e77ffba53a428af5a70'

Conflicts:
	log/development.log
no message
no message
no message
Merge branch 'master' of https://github.com/tstouffe/Stat

Conflicts:
	app/views/layouts/application.html.erb
	app/views/profiles/index.html.erb
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid