Submitting my first lab assignment

#1 Merging branches