Merge pull request #8 from fedetaglia/lukeDev

added factory girl gem
added specs for flights controller, models and also made the tests pass for validations and associations between airplane and flights
Merge branch 'master' into em_dev
test and model for airplanes and reservations
Merge pull request #9 from fedetaglia/em_dev

specs for validations and associations for flights
Merge branch 'master' into fede
Merge pull request #10 from fedetaglia/fede

Fede
added bootstrap to javascript applicaiton and also added botsrtap to a custom sass file for css
added shared header which includes links to login in a text logo and links to log out if the user is logged in
added into the index method for airplanes, flights, pages and reservation controllers @users
added a render to shared header
added links to flights, reservations and airplanes index pages on the homepage
added spec and tests for the view page index page to test the 3 linsk were there
Merge pull request #11 from fedetaglia/em_dev

Bootstrap css and testing for the nav and index page
created flight policy
updated flight pundit policy