Updated Assignment 3.2

See merge request !6

Partially Completed Assignment 3.2

See merge request !5

# Conflicts:
#   App.js

# Conflicts:
#   App.js

Partially Completed Assignment 3.2

See merge request !4

# Conflicts:
#   App.js

# Conflicts:
#   App.js

This reverts commit 1d41a98e.

Assignment 3.1

See merge request !3

# Conflicts:
#   App.js

Completed (MVP) Assignment 3.1

See merge request !1