still adding code?
Merge branch 'master' of https://github.com/jdl39/Procrastinot

Conflicts:
	views/profile.handlebars