Commit before fixing calculator
Before pulling fix from server
Removed .idea/workspace.xml
Merge branch 'master' into implement_ajax_search_globaly
Merge branch 'master' of https://github.com/leungk3/mbpsummer