version 1.0
Merge https://github.com/myisabella/RoR_facebook

Conflicts:
	README.md