Moved everything one folder up
Remove the file
Removing files
Merging files
Merge branch 'master' of https://github.com/hitteshahuja/bath_worldclock

Conflicts: