Merge branch 'jeffs_branch'
updated layout and added 'completed' feature
Merge branch 'master' into jeffs_branch
Merge branch 'master' into jeffs_branch