Added constants file IMPORTANT: add to .gitignore
Merge remote-tracking branch 'origin/master'