Merge pull request #26 from coryasato/master

Second Cleanup
boostrap styling
Merge pull request #27 from chitopolo/master

boostrap styling
further cleaning