commit for develop merge
commit to merge
Merge branch 'master' of https://github.com/PatrickSeet/battlefit_proj into api_related
commit for merge
fixed merge issue from develop
added register logic
fixing profile image upload
Merge branch 'develop' of https://github.com/PatrickSeet/battlefit_proj into frontend_jeff
pull from develop
clean out unuse code in base temp
fixed merge issues with develop
Merge pull request #14 from PatrickSeet/api_related

Api related
fix conflict to merge to dev
remove dot on logo
Merge pull request #15 from PatrickSeet/frontend_jeff

Frontend jeff
Merge pull request #16 from PatrickSeet/develop

Develop