added pre-build folder
Merge branch 'reggie' of https://github.com/SeboLith/sportifApp
pulled reggie's changes into master
pulled branch reggie into master
update
Merge branch 'reggie' of https://github.com/SeboLith/sportifApp
fixed merge
Merge branch 'reggie' of https://github.com/SeboLith/sportifApp
Merge branch 'reggie' of https://github.com/SeboLith/sportifApp
deleted unused files
Merge branch 'master' of https://github.com/SeboLith/sportifApp into reggie