Everything is connected. We are all one.
Merge branch 'dev' of github.com:CMPUT301W14T06/LARD into dev