added some message
adding a new file
radical change
Merge branch 'dev-radical_attempt' into dev-cornelius-bug-homepage_spelling_error-664
Merge branch 'sprint-2013-12-30' of https://github.com/cjohnsonSMSH/test01 into dev-cornelius-bug-homepage_spelling_error-664
added features page
preparing for db
Merge pull request #8 from cjohnsonSMSH/dev-cornelius-bug-homepage_spelling_error-664

Dev cornelius bug homepage spelling error 664
Merge pull request #9 from cjohnsonSMSH/dev-cornelius-bug-cryptic_programming_magic-1334

Dev cornelius bug cryptic programming magic 1334
Merge pull request #10 from cjohnsonSMSH/dev-cornelius-bug-homepage_spelling_error-664

Dev cornelius bug homepage spelling error 664
Merge pull request #11 from cjohnsonSMSH/sprint-2013-12-30

Sprint 2013 12 30
Merge pull request #12 from cjohnsonSMSH/master

propogation