Fixes marks blog post, dont copy&paste from word docs :)
Update Gemfile.lock
Ignore various vagrant and deployment files
update readme to make it more friendly for first installs
Do not track Gemfile.lock, the github gem manages our dependencies
Merge pull request #45 from nog3/master

Add color to tickets page.
Changed the colours, Broken Borked was changed to a “Safety” Orange
Adds an ackrc
Refactor nog3's PR to fit more inline with the existing styling
Merge branch 'nog3/newindex'
Merge branch 'master' of github.com:HSBNE/hsbne.github.com

Conflicts:
	assets/css/styles.css
somehow a test branch got into master, my bad. go back to using warning colours
Added Wiki to header

Hope this works. It should.
Merge pull request #48 from mybura/patch-1

Added Wiki to header

Worked - Would be nice to see the header changed on the wiki page to reflect the site one :)
Fixing header

Fixing formatting caused by one too many links in the header and general rearrange to fit.
Merge pull request #49 from nog3/patch-3

Fixing header
Integrates the new tumblr blog by nog into the website
Merge pull request #50 from jhogendorn/master

Integrates the new tumblr blog by nog into the website
fix the trailing blog link url
Merge branch 'master' of github.com:HSBNE/hsbne.github.com