5 Commits

Author	SHA1	Message	Date
Adam Fast	20d8013b26	Fix gitignore from merge errors.	2013-06-28 22:50:18 -05:00
Cort Buffington	7f4a4ccbd5	fix	2013-06-28 20:29:01 -05:00
Cort Buffington	34af24d617	Merge branch 'master' of https://github.com/n0mjs710/IPSC ... Conflicts: .gitignore	2013-06-28 20:28:25 -05:00
Cort Buffington	b8ce998cf4	Update .gitignore	2013-06-28 20:26:35 -05:00
Cort Buffington	b810e1377c	Adding gitignore	2013-06-27 16:17:33 -05:00