gitignored .idea
Merge branch 'master' of https://github.com/gablabelle/ng-portfolio

no idea
Updated ui-router and controller to manage url in portfolio.