added project info to readme
resolve conflict in readme
cleaned and fixed ejs files