Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	production.mdwn

diff --cc production.mdwn
index e7e27db73658c9e430c9a20893818cb136df5ec1,9a10dc5d579fe0d9e44b23cd68d30b4508e818a7..30738df2a98be2985045e6d30e3da14dbefdfbca
--- 1/production.mdwn
--- 2/production.mdwn
+++ b/production.mdwn
@@@ -424,8 -424,6 +424,12 @@@ Prototype build of 3 EasyMega v0.1 by B
  Production run of 108 pieces of TeleGPS v1.0 by
  [Advanced Circuits](http://4pcb.com), received 2014.05.21.
  
- ## sn 1982-2081 ##
+ ## sn 1982-1983 ##
+ 
+ Build 2 TeleFire v0.2 by Keith 2014.07.12
++
++## sn 1984-2083 ##
 +
 +Production run of 100 pieces of EasyMega v1.0 by
 +[Advanced Circuits](http://4pcb.com), received 2014.08.14.
 +