qa intial commit
feature 4
feature 3
Merge pull request #5 from mlessard/qa

feature 3 & 4