Adding all files we were working on today
Merge pull request #1 from nickmeehan/NICK

Adding all files we were working on today