Trying to fix the redirect issues | not exactly successsful yet
Commiting before pull
Merge branch 'master' of github.com:s-chand/pollific
Commiting after pull
Fixing merge conflicts