Routing Completed#13

smtaha512 wants to merge 2 commits intoattribesolution:masterattribesolution/ng-conf-2016-hackathon-app:masterfrom

smtaha512:mastersmtaha512/ng-conf-2016-hackathon-app:masterCopy head branch name to clipboard