assets precompiled
Merge branch 'profile_edit'
first commit
Merge branch 'master' of https://github.com/mbetts7/Grokkie
resolved merge conflict on show page