Whoops. didn't add the actual profile.ejs page
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326

Conflicts:
	views/users/profile.ejs