Added the alan file with an A in it
Added the l to the alan file
Added the a to the alan file
Added the n to the alan file
Merge remote-tracking branch 'origin/master'