ignore changes to settings.py
Node is set up in the folder Frankenstein_admin.

A basic page is up and should link to port 3100
updates to gitignore
return bin
Node is set up in the folder Frankenstein_admin.

A basic page is up and should link to port 3100
Edited the front page to have some design and added a form for louis to work with
Merge branch 'master' into louis/mongo_api

Conflicts:
	Frankenstein_admin/admin_page/app.js
	Frankenstein_admin/admin_page/bin/www
	Frankenstein_admin/admin_page/public/stylesheets/style.css
	Frankenstein_admin/admin_page/routes/index.js
	Frankenstein_admin/admin_page/views/index.jade
	Frankenstein_admin/admin_page/views/layout.jade