capfile
capistrano fixed conflicts
fixing deploy bugs
Fix deploy.rb
Load assets
gix merge conflicts
first changes
adds table to show page
footer n' stuff
Merge branch 'bootstrapping' of github.com:brian1987/ticktr-project into bootstrapping