changes Adam made- css styling and making our app look awesome
merge conflicts solved, small css changes, site looks sweet as hell
Merge pull request #18 from sidpatel13/merge_this

Merge this