Layout changes
Merge branch 'master' of https://github.com/Digi-Cazter/my-diabetes-plus

Conflicts:
	db/schema.rb