merge !!!!!Merge branch 'master' of github.com:Tmee/Dinner-Dash
ergegrMerge branch 'master' of github.com:Tmee/Dinner-Dash
merge Merge branch 'master' of github.com:Tmee/Dinner-Dash
fuckingnsasving
login stuff
ergerMerge branch 'master' of github.com:Tmee/Dinner-Dash
rge Merge branch 'master' into layout_fix
stuff
Merge pull request #76 from Tmee/layout_fix

Layout fix