El miercolero
Merge branch 'master' of https://github.com/talosdigital/angular-fullstack

Conflicts:
	.gitignore