Commit to get rid of conflicts
Merge branch 'master' of https://github.com/ebuyukcan/WiserWater
Ph inputs are sent to backend
Testing text replacement in template
Trying to merge files
fixing text in feedback view