adding find experiment
Merge branch 'master' of https://github.com/pmcote/42-Prototype into pc-login
merging
changes saved
Merge branch 'master' of https://github.com/pmcote/42-Prototype into pc-login
first commit
adding proper bootstrap row formatting
Paige, fix this stuff
Merge branch 'master' of https://github.com/pmcote/42-Prototype into pc-login
merge the things
Merge branch 'bvial' of https://github.com/pmcote/42-Prototype into ben-fix
ben fixes
Delete npm-debug.log
Delete new_user.jade
Delete find_experiment.jade
pulling down changes from Bens branch
deleting old bootstrap
new bootstrap and other code, do not merge.
nav bar is differnet
Delete editexperiment.jade
Merge pull request #11 from pmcote/pc-login

Pc login
Merge branch 'master' into run-experiment

Conflicts:
	server.js