Adding .ctrlp file to .gitignore file
Merge remote-tracking branch 'origin/development' into development
Adding phone image, in progress...
Fixing conflict