Merge branch 'master' into kyliaumerge
Merge remote-tracking branch 'kyliau/master' into kyliaumerge
finished inlining all the accessor functions
finished Sat action
Merge branch 'master' of login.engin.umich.edu:/afs/umich.edu/user/o/l/olsoni/Public/Aero552Proj
update to Image class