Add ifndef conflict resolving construction to hrl
Merge pull request #5 from AntonSizov/master

Add ifndef conflict resolving construction to hrl