index
Merge branch 'master' of https://github.com/nieuwtje/buyabike.git
blaat
Merge branch 'master' of https://github.com/nieuwtje/buyabike.git
blaat
Merge branch 'master' of https://github.com/nieuwtje/buyabike.git

Conflicts:
	BuyABike-FE/app/scripts/services/services.js
Merge branch 'master' of https://github.com/nieuwtje/buyabike.git
login form