Resume Done.
Merge branch 'dev' of github.com:blm021/jokket into dev
refactored profile page.
change unicorn file
Merge branch 'rod' into dev