this commit is test the relese bra
Merge branch 'release/2014-11-24'
feature 2 added
chnage smade feature 2
Merge branch 'master' of github.com:sathyabaman-kanesalingam/test_website