Local user path
Merging due to two different streams

Merge branch 'master' of github.com:danst0/Portfolio
Bugfix