Added new file
Changes in main.cpp
Merge remote branch arianalas/master.