rework of the base code
reworked layout and such
fixing `
doing things !!!
Merge remote-tracking branch 'upstream/angular' into angular
doing things
Merge remote-tracking branch 'origin/master' into angular
Merge pull request #1 from seiyria/angular

Angular