Separated code and headers
allowing merge
Merge branches 'master' and 'heads'
removed git gibberish