fixed conflicts
fixed changes
mila changes
finished algorithm
Merge branch 'master' of github.com:ambsvan/full_force_app
finished algorithm
css changes
bootstrap changes
merged
Merge branch 'bootstrap'