Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
facebook and styling
messed up a merge, hope I can fix it..
fixing my merge mess-up
working on moving a button
stupid little change so I can proceed with merge
spacing on button in create account
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp into HEAD

Conflicts:
	app/templates/signup.hbs
some style details
Merge branch 'master' of github.com:ewelaryba/MixologyApp

Conflicts:
	app/templates/signup.hbs
fixed styling again
fixed merge conflict
Merge pull request #44 from ewelaryba/master

some styling fixed finally ready