first commit
Merge branch 'master' of https://github.com/meagana/2014_Astr599_HW
Merge remote-tracking branch 'hw/meagana' into meagana