phase un
Merge branch 'master' of github.com:NathanChalot/lunchpad into createdashboard
début dahsboard et affichage group
Merge pull request #5 from NathanChalot/createdashboard

Createdashboard
Merge branch 'master' of github.com:NathanChalot/lunchpad into FaceBookConnectImplementation

Conflicts:
	config/routes.rb