pulled from master
Merge branch 'master' of https://github.com/JeuelyFish/ChatRoomsJS

Conflicts:
	app/assets/javascripts/controller.js
	app/assets/javascripts/model.js
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8966bf2611499f2b830144134b17b089
	tmp/cache/assets/development/sprockets/c4f579a5ae450395dbe44e69ca493350
	tmp/cache/assets/development/sprockets/c6c151e065fb6fd7044caec872528a95
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/e5b1188300254715e974bc753286cc72
	tmp/cache/assets/development/sprockets/ed46f445a18251766ad09d9039c03c71
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/fa61e453e5f7e8706ce54b1f832041b1