2 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
jacobsalmela	e8b33ec8ee	Automated installer test	2015-06-13 22:14:21 -05:00