Fixed constructors
Merge branch 'master' of http://github.com/anidev/612-2014-advanced

Conflicts:
	main.cpp
Merge pull request #33 from ZackAlfakir/master

Fixed constructors and merged