Merge pull request #1 from ajmyers01/Start_rails_project

Generate new Rails App
Build home page and general cleanup

This commit cleans up some of the example stuff from scaffolding, as
well as creating a home controller.
Merge pull request #2 from ajmyers01/build_home_page_general_cleanup

Build home page and general cleanup
Create Barebones and fill in some info
Merge pull request #3 from ajmyers01/TechLOL_site_initial_draft

Create Barebones and fill in some info
Build Photo Gallery for TechLOL
Merge pull request #4 from ajmyers01/build_photo_gallery

Build Photo Gallery for TechLOL
Update Wallpaper and fill in info

This commit adds a wallpaper and fills in some of the previously lorem
ipsum held spots.
Merge pull request #5 from ajmyers01/add_wallpaper_update_info

Update Wallpaper and fill in info
Update Gemfile for heroku
Merge pull request #6 from ajmyers01/update_for_heroku

Update Gemfile for heroku
Upgrade Nav Bar and theme for the site

This commit upgraded the asthetics of the site.
Add dates for TLS Rounds
Merge pull request #7 from ajmyers01/Upgrade_Nav_Bar_Astethics

Upgrade nav bar astethics
use postgres
Retry adding post gres
It finally works !
Merge branch 'master' into get_app_heroku_ready

* master:
  Add dates for TLS Rounds
  Upgrade Nav Bar and theme for the site
  Update Gemfile for heroku
  Update Wallpaper and fill in info
  Build Photo Gallery for TechLOL
  Create Barebones and fill in some info
  Build home page and general cleanup

Conflicts:
	Gemfile
Merge branch 'get_app_heroku_ready'

* get_app_heroku_ready:
  It finally works !
  Retry adding post gres
  use postgres
  Add dates for TLS Rounds
  Upgrade Nav Bar and theme for the site
  Update Gemfile for heroku
  Update Wallpaper and fill in info
  Build Photo Gallery for TechLOL
  Create Barebones and fill in some info
  Build home page and general cleanup