Steve Smith 0d8686b2be Merge branch 'master' into angular ... Conflicts: .gitignore		2015-04-30 11:00:45 -04:00
..
photos	Merge branch 'master' into angular	2015-04-30 11:00:45 -04:00
daniel-roth.txt	Changed include file extension	2015-04-29 09:08:58 -07:00
erik-reitan.txt	Changed include file extension	2015-04-29 09:08:58 -07:00
noel-rice.txt	Changed include file extension	2015-04-29 09:08:58 -07:00
pranav-rastogi.txt	Changed include file extension	2015-04-29 09:08:58 -07:00
steve-smith.txt	Changed include file extension	2015-04-29 09:08:58 -07:00
venkata-koppaka.rst	Most of the way through converting from word; includes sample files.	2015-04-22 15:03:00 -04:00