new seeds
Merge branch 'master' of https://github.com/citizengit/burning-airlines
Merge branch 'master' of https://github.com/citizengit/burning-airlines
added basic views
merged conflict