merge conflict resolution
Add magnetic compass code to wind direction