1401 commits

Author	SHA1	Message	Date
jacobsalmela	fd2b24f2a0	preparing files for merge and for testing automated install ... I haven't merged anything before, so hopefully, I won't mess it up too bad!	2015-06-16 11:15:15 -05:00