Initial commit
Merge branch 'master' of https://github.com/Kuddox/portfolio

Conflicts:
	Gemfile.lock
	config/secrets.yml