no change
get master
merge conflict
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
setup flights controller
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
setup backbone
merged conflict
some backbone
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
Merge branch 'master' into dev_ed
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
merged
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
added app.js
Merge branch 'master' of https://github.com/elitenomad/burning_airlines
Merge branch 'master' into dev_ed
added tests and seats