Merge branch 'test' into dev
Merge branch 'dev' of github.com:project-fifo/jingles into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
added consistent twitter button to about page
Merge pull request #5 from trentster/test

added consistent twitter button to about page