Added author to file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DisplayImage.cpp
imported std as is normal for c++ programs
Fixed indentation
Added author name to utils.cpp
Fixed namespace inclusion
Merge pull request #2 from sshihata/fix/indentation

Fix/indentation