Merge pull request #22 from energee/master

6/16 Pull Merge
Updated ereg function
Merge branch 'master' of github.com:drupaldelphia/drupaldelphia
Design updates round 2
Updated breakpoints and fontawesome module