Merge branch 'master' of https://github.com/madelineli/Tech-Notebook

Conflicts:
	Gemfile