Introduced Express to serve static content
Merge branch 'master' of github.com:julianghionoiu/real-angular-rooms

Conflicts:
	frontEnd/bower.json
	frontEnd/public/app.js
	frontEnd/public/domain/beer/beerService.js
	frontEnd/public/domain/beer/beers.html
	frontEnd/public/domain/beer/beersController.js
	frontEnd/public/index.html
Merge branch 'master' of github.com:julianghionoiu/real-angular-rooms

Conflicts:
	frontEnd/app/app.js
	frontEnd/app/domain/domain.js
	frontEnd/app/domain/room/room.html
	frontEnd/app/domain/room/roomController.js
	frontEnd/app/domain/room/roomService.js
	frontEnd/app/domain/room/rooms.html
	frontEnd/app/domain/room/roomsController.js
	frontEnd/public/app.js
	frontEnd/public/domain/domain.js
	frontEnd/public/domain/room/room.html
	frontEnd/public/domain/room/roomController.js
	frontEnd/public/domain/room/roomService.js
	frontEnd/public/domain/room/rooms.html
	frontEnd/public/domain/room/roomsController.js
	frontEnd/public/index.html
	frontEnd/src/app.js
	frontEnd/src/domain/domain.js
	frontEnd/src/domain/room/room.html
	frontEnd/src/domain/room/roomController.js
	frontEnd/src/domain/room/roomService.js
	frontEnd/src/domain/room/rooms.html
	frontEnd/src/domain/room/roomsController.js