edited by martin_dev
edited in master
changed from martin dev and merged into martin's local master
conflicts resolved?
trying to get the master origin back to be in synch so we can start working so we can all do a fresh pull and start working in our own dev
edited the readme file with our contact info, to be more readable
more tiny updates to readme; still testing git
Merge pull request #1 from hmhaley/samisgod

Create a new rails applications, added Gems bower-rails, angular-rails-t...
Merge pull request #2 from hmhaley/samisgod

moved file structure
Began Building Nav