Bootstrap skeleton generated by Yeoman
Merge branch 'master' of https://github.com/umayr/ng-fullstack

Conflicts:
	.gitignore