Merge pull request #5 from MatthewViens/feature

Feature
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
Implements pipeline syntax for image
remove log files, updates production.rb to precomplile assets
updates README.MD
updates README.MD
organizes test folder
Completes 'happy path'
fixes flash message and updates travis.yml
fixes flash test