deleted weird conflicts
Merge branch 'master' of github.com:TimelyToga/Test
Added server changes
Local Changes only
Merge branch 'master' of github.com:TimelyToga/Test
Merge branch 'master' of github.com:TimelyToga/Test
Now adding server changes to local