project workflow established
Merge pull request #1 from fence-lizards-2014/projectworkflow

Project workflow established
Merge pull request #2 from fence-lizards-2014/RailsUpAndRunning

rails framework and pg database up and running
removed index file in public folder
Merge pull request #3 from fence-lizards-2014/removing_public_index_file

removed index file in public rails folder
Added spec folder and Jasmine
-Basic Jasmine Tests can now be done.
-Spec file was also created
-This was done with rails g jasmine:install
RSpec added
-Added with rails g rspec:install
-Opened the server, did not break anything
Merge branch 'master' of https://github.com/fence-lizards-2014/NewWorldRadio into clark_testing
Merge pull request #4 from fence-lizards-2014/clark_testing

Added spec folder and Jasmine
Added .travis.yml
-Added .travis.yml
-Untested
Merge branch 'master' into clark_testing
Merge pull request #6 from fence-lizards-2014/clark_testing

Clark testing
put beats api info in readme for reference in dev
link to beats auth with token returned in url