Update a few things
Merge branch 'master' of github.com:tmcinerney/estiminatorConflicts:	app/assets/index.html## It looks like you may be committing a merge.# If this is not correct, please remove the file#	.git/MERGE_HEAD# and try again.# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master# Your branch and 'origin/master' have diverged,# and have 1 and 3 different commits each, respectively.#   (use "git pull" to merge the remote branch into yours)## All conflicts fixed but you are still merging.## Changes to be committed:#	modified:   app/assets/index.html#	modified:   app/models/user.js#	new file:   script/bootstrap#