Changing YeoMan Generator, Adding Express Server
Merging conflicts manually