Initializing dev branch
scaffolded events
Updated gitignore and Gemfile so it works on Windows
Fixed Gemfile so rails s works on Windows
Added .bat files to .gitignore
Scaffolded and merged entity User with the old facebook one
Scaffolded everything and connected facebook to database
Added migration (execute rake db:migrate at this point)
Prototype finished !
Merge branch 'dev'

Conflicts:
	Gemfile