Merge branch 'master' into cinc_release

Author: jessdtate

Documentation/ECGTool_forward.tex

@@ -8,9 +8,14 @@
 \usepackage{scirun}
 \usepackage{graphicx}
 \usepackage{float}
+\usepackage{wrapfig}
 
 % This makes displaying bold greek letters easier
 \newcommand{\BM }[1]{\mbox{\boldmath $#1$}}
+\newcommand{\etal}{{\em et al.}}
+\newcommand{\etc}{{\em etc.,}}
+\newcommand{\eg}{{\em e.g.,}}
+\newcommand{\ie}{{\em i.e.,}}
 
 \begin{document}