First commit of a MEANJS stack application.
Fixed conflict.