removing node_modules dir and putting into .gitignore
added nested models and linked models
removing .tmp files
resolving merge conflict