background image css and main variables done
fixed merge conflict and login issue