Just Commit
Merge remote-tracking branch 'upstream/development'
not finished
Merge with development
Not Finished Convert
Merge pull request #31 from rayguard/master

Not Finished Convert to HAML