Fixes horrible git merge
Merge branch 'master' of https://github.com/MatthewViens/portfolio

Conflicts:
	.gitignore
	app/assets/stylesheets/welcome.css.scss
	app/views/layouts/_navigation.html.erb
	app/views/welcome/index.html.erb
	db/test.sqlite3
	log/development.log