added header double inclusion protection
fixing conflict
Merge branch 'master' of https://github.com/ochabloz/Sharewood-Post-office-Simulator