Merge pull request #8 from lbenzene/master

merge from origin~
sql
Merge branch 'master' of github.com:Armour/www
done
Merge branch 'Armour-master'