Remove node_modules folder, add .gitignore, add express to package.json
Remove merge conflict message from README
Merge pull request #5 from concreted/master

Remove node_modules folder, add .gitignore, add express to package.json
Change name to Giraffe Draft
Create server.js
Create server.js
Update server.js
Delete index.js
Delete server.js
basic angular app. uses strict. very nice.