Change post to get in main form
resolve conflicts
¥¥Merge branch 'master' of https://github.com/thilina227/hackathon.IOsalli